force-use-luajit-system-lib

Gbp-Pq: Name 0004-force-use-luajit-system-lib.patch

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c0a638993154d5f4b57d3276770e254613f2c5cf..7fb4e3ccd1e3187ca57e11f67d2236d2ee42c732 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,26 +25,3 @@ endif
 if BUILD_WCCP
 SUBDIRS += wccp
 endif
-
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)"
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 406f08a90ba70e0f44047d8d3cecc6b559948e9c..fe7f586c00bfb2a0110464f7bf3fad586a5c96a8 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -906,29 +906,6 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)"
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am
index 3918c3d042f6c64b7ab0f63932c1f56881690754..4598097da1efc1e998480cb55d662bf5025bc727 100644 (file)
--- a/lib/bindings/Makefile.am
+++ b/lib/bindings/Makefile.am
@@ -21,7 +21,8 @@ include $(top_srcdir)/build/tidy.mk
 AM_CPPFLAGS = \
   $(LUAJIT_CPPFLAGS) \
   -I$(top_srcdir)/lib \
-  -I$(top_srcdir)/lib/records
+  -I$(top_srcdir)/lib/records \
+  -I/usr/include/luajit-2.0
 
 noinst_LTLIBRARIES = libbindings.la
 

diff --git a/lib/bindings/Makefile.in b/lib/bindings/Makefile.in
index 290a0cda5511a504571c9393e6ed71b72df884f6..4826e93cce77dcd8aa5e5411ff45f801237cf6c9 100644 (file)
--- a/lib/bindings/Makefile.in
+++ b/lib/bindings/Makefile.in
@@ -545,6 +545,7 @@ rel_prefix = @rel_prefix@
 rel_runtimedir = @rel_runtimedir@
 rel_sbindir = @rel_sbindir@
 rel_sysconfdir = @rel_sysconfdir@
+runstatedir = @runstatedir@
 runtimedir = @runtimedir@
 sbindir = @sbindir@
 schedh = @schedh@
@@ -610,7 +611,8 @@ CC_Clang_Tidy = $(CLANG_TIDY) $(Clang_Tidy_Options) $(call Clang_Tidy_CC_Files,$
 AM_CPPFLAGS = \
   $(LUAJIT_CPPFLAGS) \
   -I$(top_srcdir)/lib \
-  -I$(top_srcdir)/lib/records
+  -I$(top_srcdir)/lib/records \
+  -I/usr/include/luajit-2.0
 
 noinst_LTLIBRARIES = libbindings.la
 libbindings_la_SOURCES = \